Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Maya capture 'isolate_view' fix + minor corrections #1617

Merged
merged 6 commits into from
Jun 2, 2021
Merged

Maya capture 'isolate_view' fix + minor corrections #1617

merged 6 commits into from
Jun 2, 2021

Conversation

2-REC
Copy link
Contributor

@2-REC 2-REC commented Jun 1, 2021

  • Handling of Maya capture 'isolate_view' preset (was ignored)
  • Removal of unused 'capture_gui' module
  • Minor changes (cleaning and typo)

@2-REC 2-REC changed the title Bc/fix/capture Maya capture 'isolate_view' fix + minor corrections Jun 1, 2021
@mkolar mkolar self-requested a review June 1, 2021 15:22
@mkolar mkolar changed the base branch from main to develop June 1, 2021 15:22
Copy link
Member

@mkolar mkolar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks. Seems that it's working as intended.

@mkolar
Copy link
Member

mkolar commented Jun 1, 2021

@2-REC there was a small change in the colour setting in maya playblast, which causes conflict in maya/api/lib.py

It should be trivial to fix and I'll merge right after.

@mkolar
Copy link
Member

mkolar commented Jun 1, 2021

Just realised this is in your fork :D so I can't fix the conflict. @2-REC If you merge the latest develop to your branch you can fix it easily like this.
image

@2-REC
Copy link
Contributor Author

2-REC commented Jun 2, 2021

I have made the change to avoid the merge conflict.
The conflict was caused by this specific line in 'openpype/hosts/maya/api/lib.py':

<<<<<<< HEAD
            disp_options[key] = preset['Display Options'][key]
=======
            disp_options[key] = preset[id][key]
>>>>>>> bc/fix/capture

It seems weird that Git cannot solve this, it is a pretty basic change (replace 'Display Options' by id).
Especially that the same change was made 2 lines earlier and didn't create a conflict.
(And even weirder, the conflict didn't happen in pype2...)

@mkolar
Copy link
Member

mkolar commented Jun 2, 2021

(And even weirder, the conflict didn't happen in pype2...)

we added those colour options on following lines in 3.0 so 2.x wouldn't pick it up. I think we have accidentally added a space or something like that on the line you had to fix, so git got confused. Luckily non-essential part so no worries.

Thanks for the fix.

@mkolar mkolar merged commit b5bb8a7 into ynput:develop Jun 2, 2021
@mkolar mkolar added this to the 3.0.0 milestone Jun 2, 2021
@mkolar mkolar added the type: bug Something isn't working label Jun 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type: bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants